From: Katsumi Yamaoka <katsumi@flagship2>
Date: Fri, 21 May 2010 12:26:07 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~53
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=44a4e9b5da4e5af3db6eb54ee5ba8b2f702cb2dd;p=emacs.git

Merge from mainline.
---

44a4e9b5da4e5af3db6eb54ee5ba8b2f702cb2dd